add retain namespace scc checkbox in the dr enrollment by Harshvardhan-handa123 · Pull Request #2794 · red-hat-storage/odf-console

Harshvardhan-handa123 · 2026-05-12T04:55:45Z

JIRA Bug: https://redhat.atlassian.net/browse/DFBUGS-6239

SS:

Enroll discovered Application flow:
if retainNamespaceSCCAcrossPeers flag is false:

if true:

Enroll Managed Application flow:

asn1809

lgtm

openshift-ci · 2026-05-19T08:18:13Z

@asn1809: changing LGTM is restricted to collaborators

Details

In response to this:

lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

bipuladh · 2026-05-19T09:15:08Z

+        <Checkbox
+          id="Namespace-scc"
+          label={t(
+            'Use Same Namespace Security Context Constraints (SCC) across peers'


Suggested change

'Use Same Namespace Security Context Constraints (SCC) across peers'

'Use same Namespace Security Context Constraints (SCC) across peers'

bipuladh · 2026-05-19T09:15:31Z

+            'A Namespace with same SELinux/Annotations is automatically created on the destination cluster when the application is enrolled'
+          )}
+          isChecked={retainNamespaceSCC}
+          onChange={(_event, checked) => onRetainNamespaceSCCChange?.(checked)}


Suggested change

onChange={(_event, checked) => onRetainNamespaceSCCChange?.(checked)}

onChange={(_event, checked) => onRetainNamespaceSCCChange(checked)}

is optional chaining required?

yes it is needed

why is it needed ??

not needed.. sorry

I have removed the optional chaining

raghavendra-talur

Looks good to me, thanks!

SanjalKatiyar · 2026-05-26T10:16:54Z

          />
        </FormGroup>
+        <Checkbox
+          id="Namespace-scc"


Suggested change

id="Namespace-scc"

id="namespace-scc"

SanjalKatiyar

This PR only adds a checkbox to the UI. The user can select it, and the state gets stored in Redux, but then what happens next ??
I don't see any changes showing how that selection is being passed to Ramen. How is the selected value actually being conveyed ?? Where are we updating the DRPC with this information ??

SanjalKatiyar · 2026-05-26T11:23:43Z

I see changes in 2 flows: discovered-application-wizard and app-manage-policies (modal). Plz test and add screenshots for all the flows.

bipuladh · 2026-05-26T11:26:34Z

/hold
Please remove this once your concerns are addressed @SanjalKatiyar

SanjalKatiyar · 2026-05-26T11:28:17Z

I see changes in 2 flows: discovered-application-wizard and app-manage-policies (modal). Plz test and add screenshots for all the flows.

@vbnrh can u plz verify we are not missing any discovered app flow and these 2 flows covers everything we have in UI for all type of apps (VMs or otherwise) ??

SanjalKatiyar · 2026-05-26T11:29:26Z

/approve cancel

Harshvardhan-handa123 · 2026-05-26T12:11:08Z

I see changes in 2 flows: discovered-application-wizard and app-manage-policies (modal). Plz test and add screenshots for all the flows.

Hey I have tested the flow for discovered-application-wizard, however for the app-manage-policies I don't know how do I get to that page. @vbnrh @SanjalKatiyar Can u help me out

Harshvardhan-handa123 · 2026-05-26T12:28:50Z

This PR only adds a checkbox to the UI. The user can select it, and the state gets stored in Redux, but then what happens next ??
I don't see any changes showing how that selection is being passed to Ramen. How is the selected value actually being conveyed ?? Where are we updating the DRPC with this information ??

Addressed

SanjalKatiyar · 2026-05-26T13:57:39Z

+              'Enable the `retainNamespaceSCCAcrossPeers` flag in the RamenConfig to automatically create namespaces with matching security context constraints (SCC) acrross peer clusters. Learn more'
+            )}
+          </Alert>
+        )}


plz create a common component and use at all the required places.

SanjalKatiyar · 2026-05-26T13:58:21Z

+        isDisabled={!retainNamespaceSCCAcrossPeers}
+      />
+      {!retainNamespaceSCCAcrossPeers && (
+        <Alert


where r select-policy-wizard-content and replication-wizard-content used ?? why we need at both places ??

There are 3 places where we need to have the checkbox:
1- replication-step.tsx : DR → Protected Applications → "Enroll discovered application" wizard → step 3: Replication
2- select-policy-wizard-content.tsx: DR → Applications/VMs→ "Manage DR policy" modal → step 1: Policy (for subscription/ApplicationSet apps)
3- replication-wizard-content.tsx: DR-> Virtual MACHINES -> "Manage DR policy" modal -> step 2: Replication(only for Discovered VMs).

CC: @vbnrh

Its showing up in VM page. Its fine

Harshvardhan-handa123 · 2026-05-27T06:30:12Z

I see changes in 2 flows: discovered-application-wizard and app-manage-policies (modal). Plz test and add screenshots for all the flows.

Hey I have tested the flow for discovered-application-wizard, however for the app-manage-policies I don't know how do I get to that page. @vbnrh @SanjalKatiyar Can u help me out

Tested both the pages now.

vbnrh · 2026-05-27T06:52:38Z

+  const raw = cm?.data?.[RAMEN_CONFIG_KEY];
+  if (!raw) {
+    return [
+      {} as RamenConfig,
+      loaded,
+      new Error(
+        `Missing key ${RAMEN_CONFIG_KEY} in ConfigMap ${RAMEN_HUB_OPERATOR_CONFIG_NAME}/${ODFMCO_OPERATOR_NAMESPACE}`
+      ),
+    ];
+  }
+
+  let ramenConfig: RamenConfig = {} as RamenConfig;
+  try {
+    ramenConfig = (yaml.load(raw) || {}) as RamenConfig;
+  } catch (err: any) {
+    return [
+      {} as RamenConfig,
+      loaded,
+      new Error(
+        `Failed to parse YAML from ConfigMap ${RAMEN_HUB_OPERATOR_CONFIG_NAME}: ${
+          err?.message || JSON.stringify(err)
+        }`
+      ),
+    ];
+  }


Memoize this otherwise it will parse on every render

vbnrh · 2026-05-27T06:55:45Z

 .mco-manage-policies {
    &__form--width {
-        width: 50%;
+        width: fit-content;


Ensure that the other wizard flows are not having major layout shifts

mco-manage-policies__form--width This className is only used in this wizard.

Screen.Recording.2026-05-27.at.12.59.52.PM.mov

The flow looks good.

SanjalKatiyar · 2026-05-27T07:56:18Z

  "Enable network file system (NFS)": "Enable network file system (NFS)",
  "Enable replication": "Enable replication",
  "Enable S3-compatible object storage that spans across multiple cloud providers or hybrid environments": "Enable S3-compatible object storage that spans across multiple cloud providers or hybrid environments",
+  "Enable the `retainNamespaceSCCAcrossPeers` flag in the RamenConfig to automatically create namespaces with matching security context constraints (SCC) across peer clusters. Learn more": "Enable the `retainNamespaceSCCAcrossPeers` flag in the RamenConfig to automatically create namespaces with matching security context constraints (SCC) across peer clusters. Learn more",


why do we have "Learn more" when we are not redirecting to any doc ??

removed for now

SanjalKatiyar · 2026-05-27T07:58:08Z

/hold cancel

SanjalKatiyar · 2026-05-27T07:59:37Z

/cherry-pick release-4.22

openshift-cherrypick-robot · 2026-05-27T07:59:41Z

@SanjalKatiyar: once the present PR merges, I will cherry-pick it on top of release-4.22 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

SanjalKatiyar · 2026-05-27T07:59:41Z

/cherry-pick release-4.21

openshift-cherrypick-robot · 2026-05-27T07:59:44Z

@SanjalKatiyar: once the present PR merges, I will cherry-pick it on top of release-4.21 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

SanjalKatiyar · 2026-05-27T07:59:49Z

/cherry-pick release-4.21-compatibility

openshift-cherrypick-robot · 2026-05-27T07:59:52Z

@SanjalKatiyar: once the present PR merges, I will cherry-pick it on top of release-4.21-compatibility in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.21-compatibility

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

bipuladh · 2026-05-27T09:11:51Z

/lgtm

openshift-ci · 2026-05-27T09:11:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: asn1809, bipuladh, Harshvardhan-handa123, raghavendra-talur

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [bipuladh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Harshvardhan-handa123 · 2026-05-27T10:08:51Z

/retest

SanjalKatiyar · 2026-05-27T10:13:10Z

/override ci/prow/odf-console-e2e-aws

openshift-ci · 2026-05-27T10:13:15Z

@SanjalKatiyar: Overrode contexts on behalf of SanjalKatiyar: ci/prow/odf-console-e2e-aws

Details

In response to this:

/override ci/prow/odf-console-e2e-aws

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-cherrypick-robot · 2026-05-27T10:16:55Z

@SanjalKatiyar: new pull request created: #2853

Details

In response to this:

/cherry-pick release-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-cherrypick-robot · 2026-05-27T10:17:33Z

@SanjalKatiyar: #2794 failed to apply on top of branch "release-4.21":

Applying: scc-annotations-fix
Using index info to reconstruct a base tree...
M	locales/en/plugin__odf-console.json
M	packages/mco/components/discovered-application-wizard/wizard-steps/replication-step/replication-selection-helper.tsx
M	packages/mco/components/modals/app-manage-policies/style.scss
M	packages/mco/hooks/index.ts
Falling back to patching base and 3-way merge...
Auto-merging packages/mco/hooks/index.ts
CONFLICT (content): Merge conflict in packages/mco/hooks/index.ts
Auto-merging packages/mco/components/modals/app-manage-policies/style.scss
Auto-merging packages/mco/components/discovered-application-wizard/wizard-steps/replication-step/replication-selection-helper.tsx
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 scc-annotations-fix

Details

In response to this:

/cherry-pick release-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-cherrypick-robot · 2026-05-27T10:18:10Z

@SanjalKatiyar: #2794 failed to apply on top of branch "release-4.21-compatibility":

Applying: scc-annotations-fix
Using index info to reconstruct a base tree...
M	locales/en/plugin__odf-console.json
M	packages/mco/components/modals/app-manage-policies/style.scss
M	packages/mco/hooks/index.ts
Falling back to patching base and 3-way merge...
Auto-merging packages/mco/hooks/index.ts
CONFLICT (content): Merge conflict in packages/mco/hooks/index.ts
Auto-merging packages/mco/components/modals/app-manage-policies/style.scss
CONFLICT (content): Merge conflict in packages/mco/components/modals/app-manage-policies/style.scss
Auto-merging locales/en/plugin__odf-console.json
CONFLICT (content): Merge conflict in locales/en/plugin__odf-console.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 scc-annotations-fix

Details

In response to this:

/cherry-pick release-4.21-compatibility

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

SanjalKatiyar requested a review from vbnrh May 19, 2026 07:50

asn1809 approved these changes May 19, 2026

View reviewed changes

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch 3 times, most recently from ff64ac9 to 262a8c7 Compare May 19, 2026 08:40

bipuladh reviewed May 19, 2026

View reviewed changes

raghavendra-talur approved these changes May 20, 2026

View reviewed changes

openshift-ci Bot assigned raghavendra-talur May 20, 2026

openshift-ci Bot added the lgtm label May 20, 2026

SanjalKatiyar reviewed May 26, 2026

View reviewed changes

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from 262a8c7 to 5b88db6 Compare May 26, 2026 10:51

openshift-ci Bot removed the lgtm label May 26, 2026

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from 5b88db6 to 6a5138a Compare May 26, 2026 10:54

SanjalKatiyar requested changes May 26, 2026

View reviewed changes

openshift-ci Bot assigned SanjalKatiyar May 26, 2026

bipuladh approved these changes May 26, 2026

View reviewed changes

openshift-ci Bot assigned bipuladh May 26, 2026

openshift-ci Bot added lgtm approved labels May 26, 2026

openshift-ci Bot added the do-not-merge/hold label May 26, 2026

SanjalKatiyar removed the approved label May 26, 2026

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from 6a5138a to c45e71c Compare May 26, 2026 12:09

openshift-ci Bot added approved and removed lgtm labels May 26, 2026

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from c45e71c to ae95668 Compare May 26, 2026 13:44

SanjalKatiyar reviewed May 26, 2026

View reviewed changes

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from ae95668 to 8a8f53f Compare May 26, 2026 15:25

vbnrh suggested changes May 27, 2026

View reviewed changes

openshift-ci Bot assigned vbnrh May 27, 2026

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from 8a8f53f to a47bc76 Compare May 27, 2026 07:16

SanjalKatiyar reviewed May 27, 2026

View reviewed changes

openshift-ci Bot removed the do-not-merge/hold label May 27, 2026

scc-annotations-fix

2e62700

Harshvardhan-handa123 force-pushed the scc-annotation-dr-enrollment branch from a47bc76 to 2e62700 Compare May 27, 2026 08:05

openshift-ci Bot added the lgtm label May 27, 2026

openshift-merge-bot Bot merged commit de61aab into red-hat-storage:master May 27, 2026
5 checks passed

openshift-cherrypick-robot mentioned this pull request May 27, 2026

DFBUGS-6239: [release-4.22] add retain namespace scc checkbox in the dr enrollment #2853

Merged

	'Use Same Namespace Security Context Constraints (SCC) across peers'
	'Use same Namespace Security Context Constraints (SCC) across peers'

	onChange={(_event, checked) => onRetainNamespaceSCCChange?.(checked)}
	onChange={(_event, checked) => onRetainNamespaceSCCChange(checked)}

Uh oh!

Conversation

Harshvardhan-handa123 commented May 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asn1809 left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented May 19, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

raghavendra-talur left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SanjalKatiyar left a comment

Choose a reason for hiding this comment

Uh oh!

SanjalKatiyar commented May 26, 2026

Uh oh!

bipuladh commented May 26, 2026

Uh oh!

SanjalKatiyar commented May 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SanjalKatiyar commented May 26, 2026

Uh oh!

Harshvardhan-handa123 commented May 26, 2026

Uh oh!

Harshvardhan-handa123 commented May 26, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Harshvardhan-handa123 commented May 27, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SanjalKatiyar commented May 27, 2026

Uh oh!

SanjalKatiyar commented May 27, 2026

Uh oh!

openshift-cherrypick-robot commented May 27, 2026

Harshvardhan-handa123 commented May 12, 2026 •

edited

Loading

SanjalKatiyar commented May 26, 2026 •

edited

Loading